Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update ember-cli et al #1395

Merged
merged 2 commits into from
Jul 17, 2017
Merged

update ember-cli et al #1395

merged 2 commits into from
Jul 17, 2017

Conversation

marcoow
Copy link
Member

@marcoow marcoow commented Jul 13, 2017

🆙

})).to.eventually.be.rejectedWith(
'Authenticators cannot extend from themself. Remove the --base-class option or specify one of "oauth2", "torii" or "devise".'
);
xit('throws when the authenticator is specified as its own base class', function() {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These tests currently fail due to ember-cli/ember-cli#7019

Copy link
Collaborator

@Turbo87 Turbo87 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, not a big fan of these "update everything" commits

@@ -38,7 +38,7 @@ module.exports = {
body: EOL + ' restore(data) {' + EOL + ' },' + EOL + EOL + ' authenticate(/*args*/) {' + EOL + ' },' + EOL + EOL + ' invalidate(data) {' + EOL + ' }'
};
} else if (name === baseClass) {
throw new SilentError('Authenticators cannot extend from themself. Remove the --base-class option or specify one of "oauth2", "torii" or "devise".');
throw new SilentError('Authenticators cannot extend from themselves. Remove the --base-class option or specify one of "oauth2", "torii" or "devise".');
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems unrelated to the PR purpose of updating depenendencies?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, reverted

SilentError,
'Authenticators cannot extend from themselves. Remove the --base-class option or specify one of "oauth2", "torii" or "devise".'
);
});
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the changed exception also seems unrelated to the PR purpose

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, was trying to fix the tests until I figured out they were breaking because of ember-cli

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverted

package.json Outdated
"cors": "^2.8.4",
"ember-cli": "~2.14.0",
"ember-cli-addon-tests": "^0.7.0",
"ember-bootstrap": "^1.0.0-beta.2",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong sort order

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

package.json Outdated
"chai": "^4.1.0",
"cors": "^2.8.4",
"ember-cli": "~2.14.0",
"ember-cli-addon-tests": "^0.7.0",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks like a new dependency, not an updated one? 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@marcoow
Copy link
Member Author

marcoow commented Jul 14, 2017

@Turbo87: good to approve?

@Turbo87 Turbo87 merged commit e68a15a into master Jul 17, 2017
@Turbo87 Turbo87 deleted the update-deps branch July 17, 2017 06:19
pichfl pushed a commit to pichfl/ember-simple-auth that referenced this pull request Aug 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants